shell: disable libgnome-bluetooth debug spew

Centralize all the debug-spew-disabling here, and add
libgnome-bluetooth to the list.

https://bugzilla.gnome.org/show_bug.cgi?id=639236

diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c
index d3df15ac710d54eabc98e6118959de2b2499a3fb..a39bea1ca8d23b68e3dda661b43deeee64ef4b59 100644 (file)
--- a/src/gdmuser/gdm-user-manager.c
+++ b/src/gdmuser/gdm-user-manager.c
@@ -3059,15 +3059,6 @@ gdm_user_manager_finalize (GObject *object)
         G_OBJECT_CLASS (gdm_user_manager_parent_class)->finalize (object);
 }
 
-static void
-gdm_user_muted_debug_log_handler (const char     *log_domain,
-                                  GLogLevelFlags  log_level,
-                                  const char     *message,
-                                  gpointer        data)
-{
-        /* Intentionally empty to discard message */
-}
-
 /**
  * gdm_user_manager_ref_default:
  *
@@ -3086,11 +3077,6 @@ gdm_user_manager_ref_default (void)
                 user_manager_object = g_object_new (GDM_TYPE_USER_MANAGER, NULL);
                 g_object_add_weak_pointer (user_manager_object,
                                            (gpointer *) &user_manager_object);
-
-                /* We don't normally care about user manager messages in the shell,
-                 * so mute them */
-                g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
-                                   gdm_user_muted_debug_log_handler, NULL);
         }
 
         return GDM_USER_MANAGER (user_manager_object);

diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index 50e2c5cbfcbd1bd91e0f8fcb514c905baebb113b..ad2c4e62627c964c884ded6bc3e16427a74f3eb2 100644 (file)
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -302,10 +302,10 @@ add_statistics (GnomeShellPlugin *shell_plugin)
 }
 
 static void
-gvc_muted_debug_log_handler (const char     *log_domain,
-                             GLogLevelFlags  log_level,
-                             const char     *message,
-                             gpointer        data)
+muted_log_handler (const char     *log_domain,
+                   GLogLevelFlags  log_level,
+                   const char     *message,
+                   gpointer        data)
 {
   /* Intentionally empty to discard message */
 }
@@ -375,9 +375,13 @@ gnome_shell_plugin_start (MetaPlugin *plugin)
                                             NULL);
   g_strfreev(search_path);
 
-  /* Disable the gnome-volume-control debug */
+  /* Disable debug spew from various libraries */
   g_log_set_handler ("Gvc", G_LOG_LEVEL_DEBUG,
-                     gvc_muted_debug_log_handler, NULL);
+                     muted_log_handler, NULL);
+  g_log_set_handler ("GdmUser", G_LOG_LEVEL_DEBUG,
+                     muted_log_handler, NULL);
+  g_log_set_handler ("libgnome-bluetooth", G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_MESSAGE,
+                     muted_log_handler, NULL);
 
   /* Initialize the global object here. */
   shell_plugin->global = shell_global_get ();